Keep changes inside instances sorted by source timestamp [12421] (backport #2182) #2187
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 38e8d0f)
MiguelCompany
approved these changes
Sep 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #2182 done by Mergify.
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/